From 72ef09f55df3ec74874c34d3b9e96ab63ec7c0fa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 26 May 2019 22:16:58 -0400 Subject: [PATCH] combo box text: Make final --- gtk/gtkcomboboxtext.c | 13 +++++++++++++ gtk/gtkcomboboxtext.h | 26 +------------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c index 6f286f47c3..b363f71a53 100644 --- a/gtk/gtkcomboboxtext.c +++ b/gtk/gtkcomboboxtext.c @@ -86,6 +86,19 @@ * children, and the .linked class to the node of its internal box. */ +typedef struct _GtkComboBoxTextClass GtkComboBoxTextClass; + +struct _GtkComboBoxText +{ + GtkComboBox parent_instance; +}; + +struct _GtkComboBoxTextClass +{ + GtkComboBoxClass parent_class; +}; + + static void gtk_combo_box_text_buildable_interface_init (GtkBuildableIface *iface); static gboolean gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h index 3b4fa39746..80feb5ab4f 100644 --- a/gtk/gtkcomboboxtext.h +++ b/gtk/gtkcomboboxtext.h @@ -29,33 +29,9 @@ G_BEGIN_DECLS #define GTK_TYPE_COMBO_BOX_TEXT (gtk_combo_box_text_get_type ()) #define GTK_COMBO_BOX_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_TEXT, GtkComboBoxText)) -#define GTK_COMBO_BOX_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO_BOX_TEXT, GtkComboBoxTextClass)) #define GTK_IS_COMBO_BOX_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_TEXT)) -#define GTK_IS_COMBO_BOX_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COMBO_BOX_TEXT)) -#define GTK_COMBO_BOX_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COMBO_BOX_TEXT, GtkComboBoxTextClass)) -typedef struct _GtkComboBoxText GtkComboBoxText; -typedef struct _GtkComboBoxTextPrivate GtkComboBoxTextPrivate; -typedef struct _GtkComboBoxTextClass GtkComboBoxTextClass; - -struct _GtkComboBoxText -{ - /*< private >*/ - GtkComboBox parent_instance; - - GtkComboBoxTextPrivate *priv; -}; - -struct _GtkComboBoxTextClass -{ - GtkComboBoxClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; +typedef struct _GtkComboBoxText GtkComboBoxText; GDK_AVAILABLE_IN_ALL GType gtk_combo_box_text_get_type (void) G_GNUC_CONST; -- 2.30.2